From 4a74c7acd05b75b43f16426712a3bbd5f581937b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Thu, 7 Sep 2017 19:14:55 +0200 Subject: [PATCH] extensions: finish API update --- extensions/HCY.c | 8 -------- extensions/HSV.c | 8 -------- extensions/simple.c | 33 +++++++++------------------------ 3 files changed, 9 insertions(+), 40 deletions(-) diff --git a/extensions/HCY.c b/extensions/HCY.c index c14e7eb..82b1d69 100644 --- a/extensions/HCY.c +++ b/extensions/HCY.c @@ -304,8 +304,6 @@ rgba_to_hcya (const Babl *conversion,char *src, src += 4 * sizeof (double); dst += 4 * sizeof (double); } - - return samples; } static void @@ -326,8 +324,6 @@ hcya_to_rgba (const Babl *conversion,char *src, src += 4 * sizeof (double); dst += 4 * sizeof (double); } - - return samples; } static void @@ -344,8 +340,6 @@ rgba_to_hcy (const Babl *conversion,char *src, src += 4 * sizeof (double); dst += 3 * sizeof (double); } - - return samples; } static void @@ -364,6 +358,4 @@ hcy_to_rgba (const Babl *conversion,char *src, src += 3 * sizeof (double); dst += 4 * sizeof (double); } - - return samples; } diff --git a/extensions/HSV.c b/extensions/HSV.c index 2e90fbb..f4bf01f 100644 --- a/extensions/HSV.c +++ b/extensions/HSV.c @@ -292,8 +292,6 @@ rgba_to_hsva (const Babl *conversion,char *src, src += 4 * sizeof (double); dst += 4 * sizeof (double); } - - return samples; } static void @@ -314,8 +312,6 @@ hsva_to_rgba (const Babl *conversion,char *src, src += 4 * sizeof (double); dst += 4 * sizeof (double); } - - return samples; } static void @@ -332,8 +328,6 @@ rgba_to_hsv (const Babl *conversion,char *src, src += 4 * sizeof (double); dst += 3 * sizeof (double); } - - return samples; } static void @@ -352,6 +346,4 @@ hsv_to_rgba (const Babl *conversion,char *src, src += 3 * sizeof (double); dst += 4 * sizeof (double); } - - return samples; } diff --git a/extensions/simple.c b/extensions/simple.c index 0581737..1d8e750 100644 --- a/extensions/simple.c +++ b/extensions/simple.c @@ -17,25 +17,24 @@ float_to_u8_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *d dst += 1; src += 1; } - return samples; } static inline void float_to_u8_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples) { - return float_to_u8_x1 (conversion, src_char, dst, samples * 4); + float_to_u8_x1 (conversion, src_char, dst, samples * 4); } static inline void float_to_u8_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples) { - return float_to_u8_x1 (conversion, src_char, dst, samples * 3); + float_to_u8_x1 (conversion, src_char, dst, samples * 3); } static inline void float_to_u8_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples) { - return float_to_u8_x1 (conversion, src_char, dst, samples * 2); + float_to_u8_x1 (conversion, src_char, dst, samples * 2); } @@ -68,7 +67,6 @@ float_pre_to_u8_pre (const Babl *conversion,unsigned char *src_char, unsigned ch src += 4; } - return samples; } static inline void @@ -84,22 +82,21 @@ float_to_u16_x1 (const Babl *conversion,unsigned char *src_char, unsigned char * dst += 1; src += 1; } - return samples; } static inline void float_to_u16_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { - return float_to_u16_x1 (conversion, src_char, dst_char, samples * 2); + float_to_u16_x1 (conversion, src_char, dst_char, samples * 2); } static inline void float_to_u16_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { - return float_to_u16_x1 (conversion, src_char, dst_char, samples * 3); + float_to_u16_x1 (conversion, src_char, dst_char, samples * 3); } static inline void float_to_u16_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { - return float_to_u16_x1 (conversion, src_char, dst_char, samples * 4); + float_to_u16_x1 (conversion, src_char, dst_char, samples * 4); } static inline void @@ -130,7 +127,6 @@ float_pre_to_u16_pre (const Babl *conversion,unsigned char *src_char, unsigned c dst += 4; src += 4; } - return samples; } static inline void @@ -161,7 +157,6 @@ float_pre_to_u32_pre (const Babl *conversion,unsigned char *src_char, unsigned c dst += 4; src += 4; } - return samples; } @@ -180,22 +175,21 @@ float_to_u32_x1 (const Babl *conversion,unsigned char *src_char, unsigned char * dst += 1; src += 1; } - return samples; } static inline void float_to_u32_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { - return float_to_u32_x1 (conversion, src_char, dst_char, samples * 2); + float_to_u32_x1 (conversion, src_char, dst_char, samples * 2); } static inline void float_to_u32_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { - return float_to_u32_x1 (conversion, src_char, dst_char, samples * 3); + float_to_u32_x1 (conversion, src_char, dst_char, samples * 3); } static inline void float_to_u32_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { - return float_to_u32_x1 (conversion, src_char, dst_char, samples * 4); + float_to_u32_x1 (conversion, src_char, dst_char, samples * 4); } @@ -211,21 +205,18 @@ u32_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst dst ++; src ++; } - return samples; } static inline void u32_to_float_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u32_to_float (conversion, src_char, dst_char, samples * 4); - return samples; } static inline void u32_to_float_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u32_to_float (conversion, src_char, dst_char, samples * 3); - return samples; } @@ -233,7 +224,6 @@ static inline void u32_to_float_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u32_to_float (conversion, src_char, dst_char, samples * 2); - return samples; } @@ -249,21 +239,18 @@ u16_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst dst ++; src ++; } - return samples; } static inline void u16_to_float_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u16_to_float (conversion, src_char, dst_char, samples * 4); - return samples; } static inline void u16_to_float_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u16_to_float (conversion, src_char, dst_char, samples * 3); - return samples; } @@ -271,7 +258,6 @@ static inline void u16_to_float_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u16_to_float (conversion, src_char, dst_char, samples * 2); - return samples; } static inline void @@ -289,7 +275,6 @@ yau16_rgbaf (const Babl *conversion,unsigned char *src_char, unsigned char *dst_ dst +=4; src +=2; } - return samples; } -- 2.30.2